merge
authorAlastair Tse <atse@xensource.com>
Fri, 1 Dec 2006 11:08:34 +0000 (11:08 +0000)
committerAlastair Tse <atse@xensource.com>
Fri, 1 Dec 2006 11:08:34 +0000 (11:08 +0000)

Trivial merge